]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
messageTray: Fix warning when opening the tray
authorJasper St. Pierre <jstpierre@mecheye.net>
Thu, 21 Feb 2013 04:37:54 +0000 (23:37 -0500)
committerJasper St. Pierre <jstpierre@mecheye.net>
Thu, 21 Feb 2013 16:56:33 +0000 (11:56 -0500)
As the tray hover handler will call _cancelTrayDwell, we need to
ensure this variable is initialized even if tray dwelling isn't.

https://bugzilla.gnome.org/show_bug.cgi?id=694336

js/ui/messageTray.js

index 308b223e800fedf060c568f2642c6edc7815e626..3699ec273af1185f381255d8029688f8e4ba4260 100644 (file)
@@ -1695,6 +1695,7 @@ const MessageTray = new Lang.Class({
         this._sources = new Hash.Map();
         this._chatSummaryItemsCount = 0;
 
+        this._trayDwellTimeoutId = 0;
         this._setupTrayDwellIfNeeded();
         this._sessionUpdated();
 
@@ -1759,7 +1760,6 @@ const MessageTray = new Lang.Class({
         if (!global.display.supports_extended_barriers()) {
             let pointerWatcher = PointerWatcher.getPointerWatcher();
             pointerWatcher.addWatch(TRAY_DWELL_CHECK_INTERVAL, Lang.bind(this, this._checkTrayDwell));
-            this._trayDwellTimeoutId = 0;
             this._trayDwelling = false;
             this._trayDwellUserTime = 0;
         }